From 6f5a1b8eae5d6569cef41d4d41fbd05de8d7c571 Mon Sep 17 00:00:00 2001 From: Rob Browning Date: Tue, 10 Aug 2010 00:39:55 -0500 Subject: [PATCH] Use -O1 rather than -O2 on ia64 to fix a build failure. Fix a build failure (looks like a broken byte compiler) with newer versions of gcc (c.f. #207580). (closes: 582439) --- debian/changelog | 8 +++++++- debian/rules | 11 ++++++----- 2 files changed, 13 insertions(+), 6 deletions(-) diff --git a/debian/changelog b/debian/changelog index 34e6a1049e2..c61435f9fea 100644 --- a/debian/changelog +++ b/debian/changelog @@ -2,7 +2,13 @@ emacs23 (23.2+1-3) unstable; urgency=low * Don't try to "mkdir $(infodir)" in doc/*/Makefile.in. - -- Rob Browning Mon, 09 Aug 2010 23:50:27 -0500 + * Use -O1 rather than -O2 on ia64. Fixes a build failure (looks + like a broken byte compiler) with newer versions of gcc + (c.f. #207580). Thanks to Sven Joachim for the + report and thanks to Stéphane Glondu for the + 23.2+1-2.1 NMU. (closes: 582439) + + -- Rob Browning Tue, 10 Aug 2010 00:20:41 -0500 emacs23 (23.2+1-2) unstable; urgency=low diff --git a/debian/rules b/debian/rules index dae9466862e..9c66176e909 100755 --- a/debian/rules +++ b/debian/rules @@ -172,13 +172,14 @@ CFLAGS := -DDEBIAN -g ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS))) CFLAGS += -O0 else # not noopt - ifeq (m68k,$(DEB_HOST_ARCH)) - # fix problem with newer versions of gcc on m68k - # -O2 causes a build failure (broken byte compiler) + ifneq (,$(filter $(DEB_HOST_ARCH),m68k ia64)) + # Fix a problem with newer versions of gcc on m68k and ia64. + # There -O2 causes a build failure (broken byte compiler) - see + # bugs #207580 and #582439. CFLAGS += -O1 - else # neq (m68k,$(DEB_HOST_ARCH)) + else # neq (m68k or ia64) CFLAGS += -O2 - endif # neq (m68k,$(DEB_HOST_ARCH)) + endif # neq (m68k or ia64) endif # not noopt joblimit := $(patsubst parallel=%,%,$(filter parallel=%,$(DEB_BUILD_OPTIONS))) -- 2.30.2